From 2ebe857f7aca36b59b6d870d6692683be11e371e Mon Sep 17 00:00:00 2001 From: Drew Parsons Date: Fri, 30 Jan 2026 11:53:04 +0100 Subject: [PATCH] refresh patches --- debian/patches/30_drop_medical_example.patch | 8 +++--- .../patches/50_fix_python-modules_path.patch | 16 +++++------ .../findEXPAT_version_fix_MR12826.patch | 27 +++++++++---------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch index 4c1342849..f30539ba3 100644 --- a/debian/patches/30_drop_medical_example.patch +++ b/debian/patches/30_drop_medical_example.patch @@ -1,11 +1,11 @@ Description: Drop medical examples Last-Update: 2020-10-21 -Index: VTK-9.3.0/Examples/CMakeLists.txt +Index: vtk9/Examples/CMakeLists.txt =================================================================== ---- VTK-9.3.0.orig/Examples/CMakeLists.txt -+++ VTK-9.3.0/Examples/CMakeLists.txt -@@ -61,7 +61,7 @@ else () +--- vtk9.orig/Examples/CMakeLists.txt 2026-01-30 11:52:25.929361624 +0100 ++++ vtk9/Examples/CMakeLists.txt 2026-01-30 11:52:25.923037072 +0100 +@@ -63,7 +63,7 @@ add_example(IO/Cxx) add_example(ImageProcessing/Cxx) add_example(Infovis/Cxx) diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch index 7ad656410..2e5046021 100644 --- a/debian/patches/50_fix_python-modules_path.patch +++ b/debian/patches/50_fix_python-modules_path.patch @@ -2,11 +2,11 @@ Description: Fix path for the installation of python modules Author: Anton Gladky Last-Update: 2020-11-06 -Index: VTK-9.3.0/CMake/vtkModuleWrapPython.cmake +Index: vtk9/CMake/vtkModuleWrapPython.cmake =================================================================== ---- VTK-9.3.0.orig/CMake/vtkModuleWrapPython.cmake -+++ VTK-9.3.0/CMake/vtkModuleWrapPython.cmake -@@ -78,7 +78,7 @@ function (vtk_module_python_default_dest +--- vtk9.orig/CMake/vtkModuleWrapPython.cmake 2026-01-30 11:52:31.237391653 +0100 ++++ vtk9/CMake/vtkModuleWrapPython.cmake 2026-01-30 11:52:31.229391608 +0100 +@@ -82,7 +82,7 @@ "for Python modules.") set(_vtk_python_version_suffix) endif () @@ -15,11 +15,11 @@ Index: VTK-9.3.0/CMake/vtkModuleWrapPython.cmake endif () set("${var}" "${destination}" PARENT_SCOPE) -Index: VTK-9.3.0/Utilities/Python/CMakeLists.txt +Index: vtk9/Utilities/Python/CMakeLists.txt =================================================================== ---- VTK-9.3.0.orig/Utilities/Python/CMakeLists.txt -+++ VTK-9.3.0/Utilities/Python/CMakeLists.txt -@@ -61,7 +61,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) +--- vtk9.orig/Utilities/Python/CMakeLists.txt 2026-01-30 11:52:31.237391653 +0100 ++++ vtk9/Utilities/Python/CMakeLists.txt 2026-01-30 11:52:31.231129038 +0100 +@@ -54,7 +54,7 @@ set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") else () set(VTK_PYTHON_SITE_PACKAGES_SUFFIX diff --git a/debian/patches/findEXPAT_version_fix_MR12826.patch b/debian/patches/findEXPAT_version_fix_MR12826.patch index 6c072d7ee..fe11198ed 100644 --- a/debian/patches/findEXPAT_version_fix_MR12826.patch +++ b/debian/patches/findEXPAT_version_fix_MR12826.patch @@ -9,11 +9,11 @@ Closes #19679 ThirdParty/expat/CMakeLists.txt | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) -diff --git a/CMake/FindEXPAT.cmake b/CMake/FindEXPAT.cmake -index 00b160a4952..5dda968d005 100644 ---- a/CMake/FindEXPAT.cmake -+++ b/CMake/FindEXPAT.cmake -@@ -43,25 +43,26 @@ if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") +Index: vtk9/CMake/FindEXPAT.cmake +=================================================================== +--- vtk9.orig/CMake/FindEXPAT.cmake 2026-01-30 11:52:41.673450703 +0100 ++++ vtk9/CMake/FindEXPAT.cmake 2026-01-30 11:52:41.664769177 +0100 +@@ -43,25 +43,26 @@ file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str REGEX "^#[\t ]*define[\t ]+XML_(MAJOR|MINOR|MICRO)_VERSION[\t ]+[0-9]+$") @@ -45,13 +45,13 @@ index 00b160a4952..5dda968d005 100644 # Copy the results to the output variables and target. if(EXPAT_FOUND) -diff --git a/ThirdParty/expat/CMakeLists.txt b/ThirdParty/expat/CMakeLists.txt -index a08980c8442..90e3ce28eff 100644 ---- a/ThirdParty/expat/CMakeLists.txt -+++ b/ThirdParty/expat/CMakeLists.txt -@@ -16,7 +16,8 @@ vtk_module_third_party( +Index: vtk9/ThirdParty/expat/CMakeLists.txt +=================================================================== +--- vtk9.orig/ThirdParty/expat/CMakeLists.txt 2026-01-30 11:52:41.673450703 +0100 ++++ vtk9/ThirdParty/expat/CMakeLists.txt 2026-01-30 11:52:41.665061302 +0100 +@@ -16,7 +16,8 @@ PACKAGE EXPAT - VERSION 2.2.1 # absolute minimun, correspending to version in macOS 10.13 + VERSION 2.5.0 TARGETS EXPAT::EXPAT - STANDARD_INCLUDE_DIRS) + STANDARD_INCLUDE_DIRS @@ -59,7 +59,7 @@ index a08980c8442..90e3ce28eff 100644 include(vtkDetectLibraryType) vtk_detect_library_shared(vtkexpat EXPAT::EXPAT) -@@ -42,9 +43,9 @@ vtk_module_install_headers( +@@ -42,9 +43,9 @@ if(NOT DEFINED ENV{DASHBOARD_TEST_FROM_CTEST}) # Check for deprecated versions of expat set(expat_deprecated_version "2.6.3") @@ -71,6 +71,3 @@ index a08980c8442..90e3ce28eff 100644 "and (may) have known vulnerabilities. Consider upgrading.") endif() endif() --- -GitLab - -- 2.30.2